Git Merge The State Of Teaching Git